merge master with words