When using --merge we must rebase dev against master at the end.

Because of the way the merge works dev will not be on the same commit
as master which is bad for subsequent runs of the code. Anyway easily
solved with a quick rebase.