add manual merge