conflict on rect
conflict on rect
Merge branch 'test1'

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