Stated new branching model
typo
Fix merge conflicts