make merge