merge change