Added Will Trimble's recommendation
git log --oneline
Adding another dummy file
Trying to resolve conflict