a few more changes this time there should be a merge conflict
Merge branch 'test1'

Conflicts:
	demo.livecode.vcs/ACF9389A-1022-41F5-BA56-1A2EE23F9D69/B2B9211E-66CC-46F5-B25E-AE4BB9D204C9/properties.json
	demo.livecode.vcs/ACF9389A-1022-41F5-BA56-1A2EE23F9D69/index.json