Conflict files removed