merge master with NP machine