Incorporating a finished feature on master