manual merge victt.master