Error on 7.1 upgade

[iadr3805]

Hi, getting the bellow error when trying to update. Anyone know what’s causing it?

[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…

[KanchanChauhan]

Can you please copy paste the error trace instead of screenshot, it is not very readable.

@saurabh6790 Looks like integration setup issue. Can you take a look.

[saurabh6790]

@iadr3805 Are you still facing the same issue?

Have you added any custom field in [Razorpay Settings, PayPal Settings, Dropbox Backup] any of these three DocTypes

[iadr3805]

@saurabh6790 I tried twice yesterday with the same results. Haven’t tried again to copy paste the error as @KanchanChauhan suggested.
I do have PayPal settings.

[iadr3805]

I removed PayPal settings and run bench update again and it worked fine without any errors.

Thank for all your help.