fixed master versus feature stuff