Git Merge Not Something We Can Merge