first commit
secont commit
third commit
fourth commit
fifth commit
sixth commit
seventh commit
Fixed conflict
seventh commit