"Taking back the last commit"
The commit that needs to be taken back
Edited from branch feature1
Edited from master
Merge branch 'feature1'

Conflicts:
	hello.rb
Changes in hello via master
Changes in hello via feature2