creating conflict
Merge branch 'test1'

Conflicts:
	demo.livecode.vcs/cards/65405F61-5062-46DA-8EC2-4748E5524DC6/172A8DF0-1928-49D2-B250-88562E21338E/properties.json
	demo.livecode.vcs/cards/65405F61-5062-46DA-8EC2-4748E5524DC6/172A8DF0-1928-49D2-B250-88562E21338E/script.utf8