Revert "Resolve conflicts"

This reverts commit 8e0f135d1929caea2e98b943f2f73214b1dfaddc.