undo merge de Salima