commit 1.txt
I thought i was the first to commit,but some one else has committed something else before be and pushed it to the repo.
Merge remote-tracking branch 'origin/new1'