In this project, we're going to practice merge conflicts in Git so you can hone your skills and feel confident taking them to the real world.
Why? Merge conflicts are common when you work with many people on the same code. Practicing how to deal with them now will save you time later on.

You are currently on `master`. 

Merge the `edits` branch into the `master` branch.

This will create two merge conflicts: __README.md__ and __examples.md__. 

Using the file navigator, open __README.md__ and __examples.md__.  Identify the merge conflicts. 

In __README.md__, keep the file changes from the `edits` branch. Delete the file changes from `HEAD`. 

Don't forget to delete _all_ of Git's special markings that indicate a merge conflict. 

Click Save. 

Follow the same order of actions as above for __examples.md__: keep the `edits` branch file changes and delete the `HEAD` changes. 

Click Save. 

Add __examples.md__ to the staging area and make a commit. Your commit message could be "Resolve merge conflict". 

Ruby Time Calculator

FINAL HOURS: 60% off annual Pro memberships with code [LEARNSUMMER](https://www.codecademy.com/checkout?plan_id=proGoldAnnualV2&discountCode=LEARNSUMMER&plan_type=pro)