Added a change for original user in first.txt
Solved a conflict in file first.txt