up: make merge