Clarify merging

This closes #163 where i complain about the order of the merging.