merge issues resolved.