demo_merge_conflict For demonstration, show how merge conflicts arise and are resolved make a different change to the README file.