Requesting for some assistance on this conflict

Hello, when i run “git pull --rebase upstream 1.11.x” according to https://wiki.openmrs.org/display/docs/Git+Backporting am getting the following conflict which am finding a challenge on how to resolve, any who can help out Capture

@gcliff , you may need to run the command when you are sure you are in exact target branch.

thanks man