made a bootstrapped ladning page
fixed merge conflict