[hibernate-commits] [hibernate/hibernate-orm] 97127f: Fix merge compilation error