Bug fixing in clashed github