Solving merging conflicts in ormapping.