Delete Conflict files