Making tests for active navbar element pass
fixing merge errors