Added 123 to testfile
Resolved conflict between 123 and 456 in testfile