cleanup of conflicted files