Showing unmerged paths on git status module 4

During setup#1 on doing git status, the following error shows up
On branch master
Your branch is up to date with ‘origin/master’.

You have unmerged paths.
(fix conflicts and run “git commit”)
(use “git merge --abort” to abort the merge)

Changes to be committed:

    new file:   __CRIO__/.gitkeep
    new file:   debugging/QBox_benchmark
    new file:   debugging/cleanup.sh
    new file:   debugging/evaluate_file_permission_config_params.py
    new file:   debugging/evaluate_file_permission_task.py
    new file:   debugging/evaluate_file_transfer_fail_task.py
    new file:   debugging/evaluate_file_transfer_fail_task_direction.py
    new file:   debugging/evaluate_high_cpu_task.py
    new file:   debugging/evaluate_high_memory_task.py
    new file:   debugging/evaluate_time_taken_task.py
    new file:   debugging/evaluate_time_taken_task_direction.py
    new file:   debugging/setup.sh
    modified:   module.info

Unmerged paths:
(use “git add …” to mark resolution)

    both added:      __CRIO__/metadata.json

Solve the merge conflict first

do this:
git add filename
OR

git add .

PS: It is already written in the error

its says, merge conflict detected, and do you know how to solve it?
on typing yes, it says solve the merge conflict and type again git status.

So go to that crio metadata .json file and solve the conflict markers.

solved the conflict in that file, but still git status shows the same

After solving conflict, do

git add . (fullstop is necessary after git add to add all files)

Yeah, thanks got it.

Well done. Keep grinding.