Removing unndeeded conflict files