added feature cool
merge cool feature
hot fix in develop
merged master to develop
new hot fix from develop
develop change again
another change
merge master
added change for develop after merge from master