integrating sass navbar
merging