fix(entity): fix conflict and regenerate edmx file

8 jobs for feat/entity#3 in 5 seconds (queued for 17 seconds)