add hibernate files lost in merge