merge issues fixed.