If analyze fails, make it stop polling the server.
Fix merge conflicts.