removing the conflicted files