merge fix (log() -> LOG)