trouble switching/merging branches in git integration

I am using the git integration in a MATLAB Project and am running into an error.

I need merge a branch back into the master branch. Right now I'm in a branch called "Development." I think that I need to

1. Switch back to "master"
2. Merge "Development" into "master"

From the Branches menu, I selected "master" and then clicked "switch." I get this error message:

Git internal error (Code = -13, Class = 20): 1 conflict prevents checkout

Now what?

Thanks

Answer 1

[Erlend]

Where you able to fix it?