Removed persistanceUnitName
Fixed merge conflict