refs 607: bugfix: broken merges