Changes to reconcile merge conflicts