new file
added feature 1
aded master change
Merge branch 'feature1'
conflict test
added another line