fix merge conflicts
Merge pull request #110 from DineshRai/add_loading_gif

fix merge conflicts