push and pull in the master versus extra branch