init
fix_conflicts_after_pull