Reconcile merges from previous edits (up to date)