Updating JPA Classes
Merging