git merge Merge branch resolves conflicts

Question:
# git Merge master//merge Master branch into current branch
Auto-merging Src/caffe/test/test_eltwise_layer.cpp
Auto-merging SRC/CAFFE/LAYERS/ELTWISE_LAYER.CU
Auto-merging Src/caffe/layers/eltwise_layer.cpp
Auto-merging docs/index.md
CONFLICT (content): Merge CONFLICT in Docs/index.md
Auto-merging docs/_layouts/default.html
CONFLICT (content): Merge CONFLICT in docs/_layouts/default.html
Automatic merge failed; Fix conflicts and then commits the result.
# git Merge Master
Error:merge is isn't possible because you have unmerged files.
Hint:fix them the work tree, and then use ' Git add/rm <file> '
Hint:as appropriate to mark resolution and make a commit.
Fatal:exiting because of an unresolved conflict.
--------
Solution:
# git status
# git add docs/_layouts/default.html docs/index.md
# git Commit "Add these the files."
# git Merge Master
Already up-to-date.