fixed errors in merge