diff --git a/pygame-test.py b/pygame-test.py
index fa9be45..308c223 100644
--- a/pygame-test.py
+++ b/pygame-test.py
@@ -3,7 +3,10 @@ import pygame_menu
 import random as rnd
 
 pygame.init()
-MAINSCREEN = pygame.display.set_mode((640,480))
+
+MAINSCREEN_SIZE = (1024,768)
+MAINSCREEN = pygame.display.set_mode(MAINSCREEN_SIZE)
+
 pygame.display.set_caption("Testgame")
 
 WEISS   = ( 255, 255, 255)
@@ -22,7 +25,11 @@ class GameObject():
     __pos_x = int()
     __pos_y = int()
     __color = (0,0,0)
+<<<<<<< HEAD
     __rect_size = []
+=======
+    __size_rect = {"x":50, "y":50}
+>>>>>>> 60669e167271ec3a5538d5900155661e584b9ec0
     __movespeed = int()
     __rectobjekt = pygame.Rect
     __surface = MAINSCREEN
@@ -51,29 +58,31 @@ class GameObject():
         pass
 
     def move(self, *speed:int):
-        MOVE_SPEED = 1
-        #self.__rectobjekt.x += MOVE_SPEED
+        MOVE_SPEED = 1 #Defaultspeed
 
         if(self.__movedirection['up']):
             if(not speed): self.__pos_y -= MOVE_SPEED
             else: self.__pos_y -= speed[0]
-            if(self.__pos_y <= -100): 
-                self.__pos_y += 580
+            if(self.__pos_y <= -self.__size_rect["y"]): 
+                self.__pos_y = MAINSCREEN_SIZE[1]
 
         elif(self.__movedirection['down']):
             if(not speed): self.__pos_y += MOVE_SPEED
             else: self.__pos_y += speed[0]
-            if(self.__pos_y >= (self.__surface.get_size()[1])): self.__pos_y = -100        
+            if(self.__pos_y >= MAINSCREEN_SIZE[1]): 
+               self.__pos_y = -self.__size_rect["y"]        
 
         elif(self.__movedirection['left']):
             if(not speed): self.__pos_x -= MOVE_SPEED
             else: self.__pos_x -= speed[0]
-            if(self.__pos_x <= -100): self.__pos_x = 680          
+            if(self.__pos_x <= -self.__size_rect["x"]): 
+                self.__pos_x = MAINSCREEN_SIZE[0]          
 
         elif(self.__movedirection['right']):
             if(not speed): self.__pos_x += MOVE_SPEED
             else: self.__pos_x += speed[0]
-            if(self.__pos_x >= (self.__surface.get_size()[0])): self.__pos_x = -100        
+            if(self.__pos_x >= MAINSCREEN_SIZE[0]): 
+                self.__pos_x = -self.__size_rect["x"]      
 
         
         print("Objekt-Koordinaten "+self.__name+"= X: "+str(self.__rectobjekt.x)+" Y: "+str(self.__rectobjekt.y), end="\r")
@@ -82,7 +91,11 @@ class GameObject():
         #font = pygame.font.SysFont(None, 70)
         #text = font.render("TEST", True, (0,0,0) )
         if(self.__removed == False):
+<<<<<<< HEAD
             self.__rectobjekt = pygame.draw.rect(self.__surface, self.__color, [self.__pos_x, self.__pos_y,20,20])
+=======
+            self.__rectobjekt = pygame.draw.rect(self.__surface, self.__color, [self.__pos_x, self.__pos_y,self.__size_rect["x"],self.__size_rect["y"]])
+>>>>>>> 60669e167271ec3a5538d5900155661e584b9ec0
 
     def get_rect(self):
         return self.__rectobjekt
@@ -124,7 +137,7 @@ class GameObject():
 def spawn_entities(x:int):
     Objects = list()
     for y in range(x):
-        Objects.append(GameObject("TEST", rnd.randint(1,640), rnd.randint(1,480), rnd.randint(1,10)))
+        Objects.append(GameObject("TEST", rnd.randint(1,MAINSCREEN_SIZE[0]), rnd.randint(1,MAINSCREEN_SIZE[1]), rnd.randint(1,15)))
 
     for x in Objects:
         print(x)
@@ -137,7 +150,11 @@ background = pygame.surface.Surface((640,480))
 
 x = 3600   
 invert = False
+<<<<<<< HEAD
 spawned_entities = spawn_entities(50) #Spawnt eine definierte Anzahl an GameObjekten
+=======
+spawned_enteties = spawn_entities(50)
+>>>>>>> 60669e167271ec3a5538d5900155661e584b9ec0
 #Fenster-Hauptschleife
 while active == True:   
     MAINSCREEN.fill((255,255,255))
@@ -157,6 +174,7 @@ while active == True:
                 Player.change_direction("right")
             elif (event.key == pygame.K_LEFT):
                 print("Keydown")
+<<<<<<< HEAD
                 Player.change_direction("left")
 
     Player.draw()
@@ -168,6 +186,18 @@ while active == True:
         y.remove
 
     Player.draw_follower(spawned_entities)
+=======
+                object1.change_direction("left")
+                #rect1.move(ballpos_x, ballpos_y)
+                ballpos_x -= 10
+    
+    for y in spawned_enteties:
+        y.draw()
+        y.move(y.get_movespeed())
+    
+    object1.draw()
+    object1.move(0.5)
+>>>>>>> 60669e167271ec3a5538d5900155661e584b9ec0
 
     if(x == 0):
         for y in spawned_entities: