Update 3.txt

causing conflict with remote