merge temporary changes