Adding the missing base.html after the rebase