Resolve conflict#5
Resolve conflict#5

cuhkshenzhen/CUHKSZLib,cuhkshenzhen/CUHKSZLib,alesiong/CUHKSZLib,Yexiaoxing/CUHKSZLib,alesiong/CUHKSZLib,Yexiaoxing/CUHKSZLib,cuhkshenzhen/CUHKSZLib,alesiong/CUHKSZLib,Yexiaoxing/CUHKSZLib