changing a.txt from issue 1
Merge remote-tracking branch 'origin/dev/isssue-1'
resolving confict