All conflicts fixed but you are still merging

  1. Describe the issue briefly
    i have resolved the merge error but after stating git status it shows i am still merging

  2. How much time have you spent debugging this issue?
    (Please spend at least 15 minutes to resolve the issue on your own before posting a new topic here)

  3. What is your hypothesis?