Trying to reconcile edits