my first file
second
master
conflict
hi
Merge branch 'master' of github.com:reaperes/a5e3