fix errors that occured during merge