first change to master after newfeature1 was added
first commit of theNewFeature2
first commit after rebasing
fixed merge conflicts