Remove conlicted files