auto format and merge conflict