fixed merge error in base.html