git-demo This is a quick github demo This is my local change This is my remote change This is my remote conflict