newfile edited by master need to merge