Revert "UC-99 resolve conflicts"

This reverts commit 4dbd193a2c22653e6116b0d07fd3dff30ea7ae07.