removed merge conflict files and fixed link to in nav bar causing angular not to load