trying to merge
Merge remote-tracking branch 'origin/master'
Just a comment
trying to pull
Merge remote-tracking branch 'origin/master'