fixing merge issues

fixing merge issues