persistence conflict
Merge commit 'b6f429d71238a89540af6fb0e9c0a4415741de26'

Conflicts:
	shop/src/main/resources/META-INF/persistence.xml