Reformat Code Resolving Conflicts