conflict on rect and added a new object
Merge branch 'test1'

Conflicts:
	demo.livecode.vcs/cards/65405F61-5062-46DA-8EC2-4748E5524DC6/1B80C8D6-D3A1-49A7-8661-E7D51833B40B/properties.json
another button with id 1013 so conflict on id