From cd7861c8cb900ace3c43fd74999e15a7edf48311 Mon Sep 17 00:00:00 2001
From: PAlexanderFranklin <PAlexanderFranklin@gmail.com>
Date: Wed, 17 May 2023 01:00:26 -0700
Subject: [PATCH] merge conflict test

---
 arctic-masher.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arctic-masher.py b/arctic-masher.py
index fb8c605..79341c4 100644
--- a/arctic-masher.py
+++ b/arctic-masher.py
@@ -86,6 +86,7 @@ while True:
     for player in players:
         player.sprite.x = (tile*player.x)+2
         player.sprite.y = (tile*player.y)+2
+        # this is a comment
         pygame.draw.rect(screen, player.color, player.sprite)
 
     pygame.display.flip()