Fixing <<< HEAD on base.html