Ended up in git merge hell