OSDN Git Service

Add conflict handle