Fix merging chaos (comments branch)

This should finally work!