Added Test 1 to script line 1
Fix merge conflict in script