Opravene bullshity z mergu

pom.xml a persistence.xml