merge after every change