merge2.0
merging fixed, otimization v2.0