persistence.xml conflict
Merge branch 'master' of https://github.com/iraklivasha/taxi-backend.git
removed entities