howto: unclean merges