fix errors made during merge