Stop using diagnostics to avoid merge conflicts.