Try and fix conflicts

include/rewindow/types/WindowEvents.hpp

@@ -54,6 +54,13 @@ namespace ReWindow {
         KeyUpEvent(Key key) : KeyboardEvent(key, KeyState::Released) {}
     };
 
+    class MouseWheelEvent : public MouseEvent
+    {
+    public:
+        int wheel_dt;
+        MouseWheelEvent() = default;
+        MouseWheelEvent(int wheel) : MouseEvent(), wheel_dt(wheel) {}
+    };
 
     class MouseButtonDownEvent : public MouseEvent {
     public: