One does not simply merge into master