checked in first file
second commit
third commit
fourth commit
fifth commit
sixth commit
seventh commit
Revert "sixth commit"

This reverts commit 96b552a4ae9192eb02787a632af19d900dcb5727.
final commit
added a change not to be included
added 4 5
deleted 5
added some changes in second
added changes in master
merged master and second
added changes in the secomd file
changes made in second
changes in second in master
resolved conflicts and merged
3 modified in master