changes in navpart
conflict resolved