Persist instead of merge to prevent deadlocks.  Entities have already been changed outside the DAO, so persist is just a hint