init branch
fixed describe
fixed conflict