Update manual merge