Testing

I made a patch for changing the Save map dialog. The problem is that in the pull request there are 2 older commits which do no belong there. I tried to merge with upstream/master, but it stil shows them. What should I do about them?