edit newtest
edit master test
merge successful