hibernate conflicts