edit master
edit mastermerge