refactor: updated minor typos

typos fixed

Author: ayushkrtiwari

src/quant_research_starter/factors/__init__.py

@@ -1,39 +1,19 @@
-<<<<<<< HEAD
 """Factors module public API."""
 
 from .base import Factor
+from .bollinger import BollingerBandsFactor
 from .momentum import CrossSectionalMomentum, MomentumFactor
 from .size import SizeFactor
 from .value import ValueFactor
 from .volatility import IdiosyncraticVolatility, VolatilityFactor
 
 __all__ = [
     "Factor",
-    "MomentumFactor",
+    "BollingerBandsFactor",
     "CrossSectionalMomentum",
-    "ValueFactor",
+    "MomentumFactor",
     "SizeFactor",
-    "VolatilityFactor",
+    "ValueFactor",
     "IdiosyncraticVolatility",
+    "VolatilityFactor",
 ]
-=======
-"""Factors module public API."""
-
-from .base import Factor
-from .bollinger import BollingerBandsFactor
-from .momentum import CrossSectionalMomentum, MomentumFactor
-from .size import SizeFactor
-from .value import ValueFactor
-from .volatility import IdiosyncraticVolatility, VolatilityFactor
-
-__all__ = [
-    "Factor",
-    "BollingerBandsFactor",
-    "CrossSectionalMomentum",
-    "MomentumFactor",
-    "SizeFactor",
-    "ValueFactor",
-    "IdiosyncraticVolatility",
-    "VolatilityFactor",
-]
->>>>>>> 8d5d7c51f2ba0fc6db1b9abe844cee2182014d3c