Overcoming my bad merging habits.