straightening out merge issues