# Conflicts: # SMIMS-Game/MyWorld.class # SMIMS-Game/SpikedPlattform.class # SMIMS-Game/SpikedPlattform.java # SMIMS-Game/project.greenfoot