Fix rebase errors

Author: Hypernoot

src/badguy/ghoul.cpp

@@ -137,7 +137,7 @@ Ghoul::get_settings()
 }
 
 bool
-Ghoul::collision_squished(GameObject& object)
+Ghoul::collision_squished(MovingObject& object)
 {
   auto player = Sector::get().get_nearest_player(m_col.m_bbox);
   if (player)

src/badguy/ghoul.hpp

@@ -26,7 +26,7 @@ class Ghoul final : public BadGuy
   static std::string display_name() { return _("Ghoul"); }
   std::string get_class_name() const override { return class_name(); }
   std::string get_display_name() const override { return display_name(); }
-  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(PathObject)).add(typeid(Ghoul)); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(Ghoul)); }
   virtual bool is_snipable() const override { return true; }
   virtual bool is_flammable() const override { return false; }