branch test
feature 1 commit
master modification
 both master and feature 1 modification