Fixed conflicts

Author: rhit-collinse

helloWorld.py

@@ -5,3 +5,4 @@
 print("Hi, this is Mark A. Yoder")
 # Add your name below here.  Be sure it still runs.
 print("Hello, my name is Ash Collins.")
+print("Hi, this is Logan Manthey")