Remove conflicted files