git_demo This is for CMPUT 301 Here is a change in the file (after the conflict) to the file This is a change I made from github