Reconcile with main