sorted out merge issues