fixed errors caused by merge