Fix merge conflicts
Merge pull request #31 from sunny-mittal/sunny

Fix merge conflicts