# Conflicts: # .gitignore # .idea/compiler.xml # .idea/encodings.xml # .idea/vcs.xml # pom.xml # src/main/java/com/ossez/lang/tutorial/overview/HelloWorld.java