Merge Hibernate files