entity manager doctrine my update
merge fix