remove conflicted files