removing more conflicted files