merge with reconcile
fix merge reconcile