Added a line in the second copy
Try to resolve conflict