merge all copies of master into programming.