modify file A to show a git diff
modify a couple of files for merge demo