fix(entity): fix conflict and regenerate edmx file

8 jobs for feat/entity#3 in 5 seconds (queued for 17 seconds)
Name Stage Failure
failed
build Build
Configure a credential helper to remove this warning. See
https://docs.docker.com/engine/reference/commandline/login/#credentials-store

Login Succeeded
Building Heroku-based application using gliderlabs/herokuish docker image...
Cannot connect to the Docker daemon at tcp://localhost:2375. Is the docker daemon running?
Cannot connect to the Docker daemon at tcp://localhost:2375. Is the docker daemon running?
Cannot connect to the Docker daemon at tcp://localhost:2375. Is the docker daemon running?
ERROR: Job failed: command terminated with exit code 1