aligned changes of master