Revert "Resolve merge conflicts"

This reverts commit 9e509fe23715c6f1bab28b66d5386c70776a7f0e.