pré pull
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
pre pull
merged conflicts
commit
added logic for collect candies
Merge remote-tracking branch 'origin/master'
fixed few bugs