- manual merge