Fixed merged conflict
Merge pull request #1 from Folashade/nishita

Fixed merged conflict