[hibernate-dev] Snapshot conflict with merge