Fix so bot doesn't crash on merges