correct navbar of twitter bootstrap
merge