bad merge
logs, logs everywhere