Updated merge - Mas