merge pot change