Removed conflicted files