Merge Master and Lean