Saarthak Seth

@garimasingh128 @vj-codes after the removal of travis.yml all the checks have passed and i've also resolved the merge conflicts, Please review the pr again :-)

> @CodeChamp-SS please resolve the merge conflicts sure

@vj-codes I had resolved the conflicts but it's still showing them, i guess they've to be taken care of while merging the pr only and you can also see that...

> > @vj-codes I had resolved the conflicts but it's still showing them, i guess they've to be taken care of while merging the pr only and you can also...

> > > > > @vj-codes I had resolved the conflicts but it's still showing them, i guess they've to be taken care of while merging the pr only and...

> > > > > > @vj-codes I had resolved the conflicts but it's still showing them, i guess they've to be taken care of while merging the pr only...

what difference will `git merge --continue` make ?

> @CodeChamp-SS please resolve the merge conflicts k, lemme try once again

> @CodeChamp-SS ahh I think it worked there were more than 2 before but can you also try to resolve the remaining 2 please, thanks!

they are not getting resolved I don't know why ☹️