fix merge conflicts on base.html