I'm very sorry but it's my first time using GitHub.
I tried to merge and it failed, so I reverted the merge and cannot merge again, it just says "Already up to date."
I can't find a way of trying another merge, just reverting and redoing the same merge, but I want to try other conflict...