Fixed conflict generated by github merge