I did some work on a branch, then rebased master and committed my work. I had to solve a few conflicts but otherwise everything went fine. Now when I checkout master (or any
