Hibernate update
small update Hibernate and Merge