Can you post the output of the command git log?
Seems you have Eluna and Objscale. The errors seem to be caused at least partly from that.
Try getting the current commit's hash you are on and save it in case things go wrong.
You would need to manually solve the errors marked with these tags in the files:
Code:
<<<<<<< HEAD
// Code you have
=======
// Code the merged repo has
>>>>>>>
For the eluna conflicts it might be better to select the one with Eluna code (the first code block). (unsure if both work or both fail)
For the conflicts about code about modelids use the second code block.
After that see that there are no more conflicts and commit.
Then pull Eluna and try to solve any new conflicts.
When you want to try revert back to where you were, try using git reset --hard <yoursavedcommithash>