@Skif-off yeah for git the console is better.
What I understand @frlan' is asking is for you to do a [git rebase](https://git-scm.com/docs/git-rebase) against the master branch to combine the two commits together and hopefully make the merge you did in your branch disappear (lesson: only ever pull Geany master into your master, not your branch).
`git rebase --interactive` makes it easier.