This repo is for trying to run into problems such as merge conflicts.

It's also for figuring out how rebasing works and to get some practice with it.

I fixed all of your typos and bad english.