Fixing merge conflicts and bugs #280

Closed royankit11 closed 3 weeks ago