removing case conflicted files