Resolve conflicts

Author: ryanhefner

package-lock.json

@@ -49,7 +49,7 @@
     "react-dom": ">=15"
   },
   "dependencies": {
-    "@types/react": "^16.9.53",
+    "@types/react": "^16.9.54",
     "@types/react-dom": "^16.9.9",
     "clean-react-props": "^0.4.0",
     "lodash.throttle": "^4.1.1",

package.json

@@ -7,7 +7,7 @@ export interface ScrollTriggerEventArgs {
   velocity: number;
 }
 
-export interface ScrollTrigger extends Component {
+export interface ScrollTriggerProps {
   component?: ReactNode;
   containerRef?: HTMLElement | string;
   throttleResize?: number;
@@ -17,3 +17,7 @@ export interface ScrollTrigger extends Component {
   onExit?: (args: ScrollTriggerEventArgs) => {};
   onProgress?: (args: ScrollTriggerEventArgs) => {};
 }
+
+declare class ScrollTrigger extends Component<ScrollTriggerProps> {}
+
+export default ScrollTrigger;