Revert "fix conficts"

This reverts commit d34b4ded5f758817730a4464e18b4c547c3cec41.
Revert "Settings: Bring back app ops"

This reverts commit b994188fcfd983cc1195d98371f9815a6c0ae251.