Adding snake
Fixing merge error