master merge nametake