couple of small merge errors