Revert conditiona; loading
Merge conflict