Merge pull request #114 from karishmag9/samarth

Samarth
remove merlin.properties