removed conflicted files