further changes to testFile
Solved merge conflict