added modified the file
there are some conflicts
Merge branch 'conflict'
changed the text
conflict branch i am on
saved my file index to master