git branch merge hell