Minor fixes

diff --cc css/mock1.css
index 8a58a9c9cff05804af33ebfa6b49ad8f67f87b5c,6bd61bef58226d0d9ddcc32499f71f6d3f2aa2be..a6ec32bdc41583582502cf0755f73ebcef0ac778
--- 1/css/mock1.css
--- 2/css/mock1.css
+++ b/css/mock1.css
@@@ -228,7 -229,6 +229,10 @@@ a.hchild:hover,a.hchild:active 
  .footer {
      background: var(--jumbotron-bg);
      color: rgba(var(--footer-text-color),.9);
++<<<<<<< HEAD
 +    margin-top: 2vh;
++=======
++>>>>>>> 76fe2571937371940ac0e6a9e43561bbe25dafc5
      display: flex;
      flex-wrap: nowrap;
      min-height: 27vh;