Pay me 400€ and ill have the merge(with no added features or content) ready in 15 work days. I do python for a living and could easily fix this on my free time. Seeing that they have been struggling for about a year to fix the merge, I suggest that they take some courses in python, there are some great free lessons online.