updating 1.txt
resolving conflicts