second commit, edited
third commit
merged with master