Merging branches on local repo after a huge merge conflict