I already said that it wasn't my intention. I had an issue with the web interface saying I had conflicts which I couldn't see on command line, and so in trying to fix that issue I accidentally merged the branch.