Merge conflict pre-emptive strike #2