add merging md file

-simple commands
-reading merge conflict git annotations