delete log
merge conflict
move and look working!