Revert "Merge Resolve"

This reverts commit c49976da9c7614d629c72e87ef4f6c19589626da.