Update Error from (ERPNext: v8.0.23 (master))

I am trying to update to the latest version from.

ERPNext: v8.0.23 (master)
Frappe Framework: v8.0.36 (master)

I get the following errors.

INFO:bench.utils:updating bench
INFO:bench.utils:git pull
error: Your local changes to the following files would be overwritten by merge:
	.travis.yml
	bench/commands/utils.py
	bench/config/common_site_config.py
	bench/config/templates/nginx.conf
	bench/patches/patches.txt
	playbooks/develop/includes/setup_bench.yml
	playbooks/develop/includes/setup_dev_env.yml
	playbooks/develop/includes/wkhtmltopdf.yml
	vm/ansible/roles/wkhtmltopdf/tasks/main.yml
	vm/ansible/vm.yml
Please, commit your changes or stash them before you can merge.
Aborting
Traceback (most recent call last):
  File "/usr/local/bin/bench", line 11, in <module>
    load_entry_point('bench', 'console_scripts', 'bench')()
  File "/home/frappe/.bench/bench/cli.py", line 40, in cli
    bench_command()
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 722, in __call__
    return self.main(*args, **kwargs)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 697, in main
    rv = self.invoke(ctx)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 1066, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 895, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 535, in invoke
    return callback(*args, **kwargs)
  File "/home/frappe/.bench/bench/commands/update.py", line 35, in update
    update_bench()
  File "/home/frappe/.bench/bench/utils.py", line 256, in update_bench
    exec_cmd("git pull", cwd=cwd)
  File "/home/frappe/.bench/bench/utils.py", line 140, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull

What could be wrong?

There seems to be some modifications in your frappe or erpnext folders. To resolve this error:

cd frappe-bench/apps/erpnext
git status #This would show you the files which are changed
git checkout . #This would delete the changes made by you in the erpnext branch

Do the above in the frappe folder as well. Basically if you need to make changes you need to create an app for the same

Updated by following this link. Thanks.