can't_merge

user@hostname:~/path/to/repo> git merge feature_branch-2
error: Merging is not possible because you have unmerged files.
hint: Fix them up in 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.
user@hostname:~/path/to/repo>
user@hostname:~/path/to/repo> #################################################################################################
user@hostname:~/path/to/repo> #################################################################################################
user@hostname:~/path/to/repo>
user@hostname:~/path/to/repo> git status
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:
        modified:   .gitignore
        new file:   step/README.md
        new file:   step/postgres_install/README.md
        new file:   step/postgres_install/ansible.cfg
        new file:   step/postgres_install/defaults.yml
        renamed:    step/step_server_env/defaults_postgres.yml -> step/postgres_install/defaults_postgres.yml
        new file:   step/postgres_install/files/.alias
        new file:   step/postgres_install/files/.bashrc
        new file:   step/postgres_install/files/.editrc
        new file:   step/postgres_install/files/.forward
        new file:   step/postgres_install/files/.toprc
        new file:   step/postgres_install/files/backup_postgres.sh.9
        new file:   step/postgres_install/files/bin/.pg.env
        new file:   step/postgres_install/files/bin/client-postgres
        new file:   step/postgres_install/files/bin/postgresql.service
        new file:   step/postgres_install/files/bin/postgresql_rpm.service
        new file:   step/postgres_install/files/bin/start-postgres
        new file:   step/postgres_install/files/bin/status-postgres
        new file:   step/postgres_install/files/bin/stop-postgres
        new file:   step/postgres_install/files/bin/stop-postgres-immediate
        new file:   step/postgres_install/files/pg-rhel7-env.tar.gz
        new file:   step/postgres_install/files/pg_hba.conf
        new file:   step/postgres_install/files/postgresql.conf
        new file:   step/postgres_install/files/postgresql.conf.9.2
        new file:   step/postgres_install/files/scb_opensource_postgres.cfg
        new file:   step/postgres_install/inventory.yml
        new file:   step/postgres_install/postgres_install.yml
        new file:   step/postgres_install/postgres_install.yml.copy
        new file:   step/postgres_install/postgres_install_from_repo.yml
        new file:   step/postgres_install/sed-test.yml
        deleted:    step/step_server_env/.gitignore
        modified:   step/step_server_env/README.md
        modified:   step/step_server_env/ansibleSequence.sh
        deleted:    step/step_server_env/get_postgres_test.yml
        modified:   step/step_server_env/inventory.yml
        new file:   step/step_server_env/prepare_step_server_and_resize.yml
        deleted:    step/step_server_env/remove_parted.yml
        modified:   step/step_server_env/resize_vgsys-postgres.yml
        modified:   step/step_server_env/step_user_env.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   step/step_server_env/prepare_step_server.yml