Working on touch motion with square
Fixing conflict when syncing

Gave a Conflict in Card when Syncing.