Revert "Merge Resolved"

This reverts commit 6d775d38ed20654efdcab230cb03449505971596.