Olga: merge