You have not concluded your merge (MERGE_HEAD exists)

 I made a branch called 'f' and did a checkout to master. When I tried the git pull command I got this message:

You have not concluded your merge (MERGE_HEAD exists).

Please, commit your changes before you can merge.

When I try the git status, it gave me the following:

On branch master

# Your branch and 'origin/master' have diverged,

# and have 1 and 13 different commit(s) each, respectively.

#

# Changes to be committed:

.......

# Untracked files:

#   (use "git add ..." to include in what will be committed)

#

#   Coachbase/

#   log/development.log.orig

#   log/restclient.log.orig

what should I do?