messy manual merge