merge natalia changes