Merge conflict pre-emptive strike