conflict, and added a should for updating related records