merge-problems (hopefully) solved