Update merge to master.txt