all models now guaranteed to be merged back into the session when a flush fails; merge error fixes for new and deleted models