Noorul Islam <noorul@noorul.com> writes:

> I am not sure why this conflict is arising even after resetting to
> head and then doing a pull
>
> $ noorul@sajida:~/emacs/org-mode$ git reset --hard
> HEAD is now at ba6b6f3 Merge branch 'master' of git://repo.or.cz/org-mode
>
> $ noorul@sajida:~/emacs/org-mode$ git pull
> Auto-merging ORGWEBPAGE/index.org
> CONFLICT (content): Merge conflict in ORGWEBPAGE/index.org
> Automatic merge failed; fix conflicts and then commit the result.

Because you reset to master, which is your copy, rather than resetting
to origin/master, which would discard local changes.