GitGraph CSCI-3323-001 Spring 2024 <-- this was the line with the merge conflict Jacob Nodes Check out my codegolf! https://code.golf/golfers/Jacob385 Im ranked 18th on the global leaderboard for java.