Fix merge of hibernate/JPA proxies