Added Contact Link to the navigation bar
Fixed merge conflict