modified some files
process the conflicted files