Fix errors caused by merge