Josh

fixed merge issues