update jpa merge