del new.txt
fixing merge