Git Merge can be a real PITA at times.