Error on 7.1 upgade

[iadr3805]

Followed all the tasks from this page and still the above error.

[Solved] Updating from 7 to 7.1

bench update error kindly help thanks root@ubuntu-1gb-lon1:/home/frappe/frappe-bench# bench update INFO:bench.utils:updating bench Updating ed846f2..a8312f6 error: Your local changes to the following files would be overwritten by merge: bench/cli.py bench/commands/setup.py bench/commands/utils.py playbooks/develop/includes/wkhtmltopdf_centos.yml playbooks/develop/includes/wkhtmltopdf_ubuntu_debian.yml playbooks/develop/ubuntu.yml vm/ansib…