Alvaro's merge