fixed merge conflict on landing page