post merge fix: E.me loading