fix a few minor merge issues