Fixed merge problem in base.html.