fix couple minor merge issues