nav bar color
merge
s
style change