started over with responsive nav files
resolved conflicts