Merge branch 'test1'
creating conflict
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
Merge branch 'master' into test1
creating cp conflict
conflcit on cp
Merge branch 'master' into test1

Conflicts:
	demo.livecode.vcs/cards/65405F61-5062-46DA-8EC2-4748E5524DC6/79F270DA-9E6D-4C1B-BBD4-1BF1C50C09AB/properties.json