# Conflicts: # SMIMS-Game/Player.class # SMIMS-Game/Player.ctxt # SMIMS-Game/Player.java # SMIMS-Game/project.greenfoot