resolved some bug after merge
resolved conflict