Revert "Resolved merge conflicts"

This reverts commit 02be973b24a6483c3e363615a234733bfe2b6f86.