manual merge like a sucker