Do you have to commit merge changes for this?

Chris was here.
Merge pull request #2 from Temp-capstone/brian

Do you have to commit merge changes for this?

Yes :(