Added a change by original user
Solve a conflict in file first.txt