Bench Update error on merge

I tried updating to get a fix and i was getting an error, then i did a git pull from ERPNEXT and Frappe, then when i did a bench update i got this error

/frappe-bench⟫ bench update
INFO:bench.utils:updating bench
Already up-to-date.
From GitHub - frappe/erpnext: Free and Open Source Enterprise Resource Planning (ERP)

  • branch develop → FETCH_HEAD
    Already up-to-date.
    /home/its/frappe-bench/env/local/lib/python2.7/site-packages/pip/vendor/requests/packages/urllib3/util/ SNIMissingWarning: An HTTPS request has been made, but the SNI (Subject Name Indication) extension to TLS is not available on this platform. This may cause the server to present an incorrect TLS certificate, which can cause validation failures. You can upgrade to a newer version of Python to solve this. For more information, see
    /home/its/frappe-bench/env/local/lib/python2.7/site-packages/pip/vendor/requests/packages/urllib3/util/ InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see Advanced Usage - urllib3 2.0.0a2 documentation.
    Requirement already up-to-date: pip in ./env/lib/python2.7/site-packages
    Traceback (most recent call last):
    File “/usr/lib/python2.7/”, line 162, in _run_module_as_main
    main”, fname, loader, pkg_name)
    File “/usr/lib/python2.7/”, line 72, in _run_code
    exec code in run_globals
    File “/home/its/frappe-bench/apps/frappe/frappe/utils/”, line 79, in
    File “/home/its/frappe-bench/apps/frappe/frappe/utils/”, line 12, in main
    commands = get_app_groups()
    File “/home/its/frappe-bench/apps/frappe/frappe/utils/”, line 21, in get_app_groups
    app_group = get_app_group(app)
    File “/home/its/frappe-bench/apps/frappe/frappe/utils/”, line 27, in get_app_group
    app_commands = get_app_commands(app)
    File “/home/its/frappe-bench/apps/frappe/frappe/utils/”, line 58, in get_app_commands
    app_command_module = importlib.import_module(app + ‘.commands’)
    File “/usr/lib/python2.7/importlib/”, line 37, in import_module
    File “/home/its/frappe-bench/apps/frappe/frappe/commands/”, line 59, in
    commands = get_commands()
    File “/home/its/frappe-bench/apps/frappe/frappe/commands/”, line 53, in get_commands
    from .site import commands as site_commands
    File “/home/its/frappe-bench/apps/frappe/frappe/commands/”, line 7, in
    from frappe.limits import update_limits, get_limits
    File “/home/its/frappe-bench/apps/frappe/frappe/”, line 5, in
    from frappe.installer import update_site_config
    File “/home/its/frappe-bench/apps/frappe/frappe/”, line 15, in
    from frappe.model.sync import sync_for
    File “/home/its/frappe-bench/apps/frappe/frappe/model/”, line 44
    <<<<<<< HEAD
    IndentationError: expected an indented block

Any help please?

looks like you have conflicts in frappe app, please resolve the conflicts and commit the changes then try bench migrate