navigation changes
merge and navigation