completed navbar
resolved conflicts