Reconcile with feedback from pull request