fix errors caused by merge