Revert "Merge commit and conflict resolution"

This reverts commit a1b53020115831abd18766f59a68e1d3840efb51.