manual merge against master