Fix merge conflict
Merge pull request #111 from rajubairishetti/merge-conflict

Fix merge conflict