OSDN Git Service

Remove conflict indicator.