Solve merge conflict
Undo debug settings