attempting manual merge