merge v2 fixed errors cause by prev merge