commit file1, file2, file3
changes to master
feature commit
Merge branch 'featuremergerecursive'