Remove merge artifacts, apply formating to merged files.