Checkin in Plastic SCM to create my first conflict
First merge performed in Plastic SCM