OSDN Git Service

eliminate conflict indicator