Ahhh. So you always merge the changes from your

master

to the

dev

of the original repo?