merge
Remove stray log