demonstrating merge conflic