Git Merge Force All Caps