adding testfile
resolving conflict in testfile