Requesting for some assistance on this conflict

1

Hello, when i run “git pull --rebase upstream 1.11.x” according to Git Backporting - Documentation - OpenMRS Wiki am getting the following conflict which am finding a challenge on how to resolve, any who can help out Capture

2

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

3

thanks man