diary conflict after pull from pc?
Merge branch 'master' of github.com:jacknoerror/lehuoRepo

trying to merge dairy one or two sentences and see the going
up to orders