resolve conflict

Author: HumphreyYang

lectures/_toc.yml

@@ -17,6 +17,13 @@ parts:
   - file: linear_equations
   - file: eigen_I
   - file: intro_supply_demand
+- caption: Linear Dynamics
+  numbered: true
+  chapters:
+  - file: pv
+  - file: cons_smooth
+  - file: equalizing_difference
+  - file: cagan_ree
   - file: geom_series
 - caption: Probability and Distributions
   numbered: true
@@ -26,33 +33,31 @@ parts:
   - file: monte_carlo
   - file: heavy_tails
   - file: schelling
-- caption: Dynamics
+- caption: Nonlinear Dynamics
   numbered: true
   chapters:
   - file: solow
   - file: scalar_dynam
   - file: cobweb
   - file: olg
+  - file: commod_price
+- caption: Stochastic Dynamics
+  numbered: true
+  chapters:
   - file: markov_chains_I
   - file: markov_chains_II
-  - file: eigen_II
-  - file: commod_price
-  - file: cons_smooth
-  - file: equalizing_difference
-  - file: cagan_ree
+  - file: time_series_with_matrices
 - caption: Optimization
   numbered: true
   chapters:
   - file: lp_intro
-  - file: comparative_adv
-  - file: nonlinear
   - file: short_path
 - caption: Modeling in Higher Dimensions
   numbered: true
   chapters:
+  - file: eigen_II
   - file: input_output
   - file: lake_model
-  - file: asset_pricing
   - file: networks
 - caption: Markets and Competitive Equilibrium
   numbered: true
@@ -63,7 +68,6 @@ parts:
   numbered: true
   chapters:
   - file: simple_linear_regression
-  - file: lr_with_matrices
   - file: mle
 - caption: Other
   numbered: true