Update merge procedure

Based on current state of discussion in #1. If we're happy with this, we can close #1 until someone takes issue with the way it's working.