correcting some merge issues