added 'code'
added f1.txt
added master.txt
Merge branch 'feature1'
added conflict.txt
added happiness
added sadness
resolved conflict