Git Merge Accept All Formatting