Working merge