merge issues rectified