Quickly get rid of unwanted conflicted files