GreenBlitz4590Programmers Fixed merge conflicts left overs

Users who have contributed to this file

• fauge7
• GreenBlitz4590Programmers
• chasehaddleton