Creating a Conflict

    • Create a conflicting change in the master branch.