Generating a conflict pre-merge