Removing conflicted files