lancope second branch committed
conflict resolved in second branch.