Fix/merge fixes #70

Closed Aish-warya-Joshi closed 10 months ago