First commit - Hello,Git!
Second commit - Repository for homework.
Third commit - Adding changes from new branch, Keynotes2.
Fourth commit - Creating conflict between branches.
Fifth commit - resolving merge conflict.