Bitbucket is saying to merge, but my branch is up to date

Question

I think the title says it all. I have a branch in bitbucket but when I try to merge with master it says there are conflicts and gives me instructions to merge. Basically:

1. go to local master
2. pull master from origin
3. got to local branch
4. merge local branch from local master
5. when i do this, it says up to date and therefore there is nothing new to push to my branch.

Im kind of stuck at this point. any ideas on how to resolve?