Reconcile merge conflicts

Reconcile merge conflicts