Fixing some merge conflicts that someone pushed into the mapeditor and
shop classes