diff --git a/themes/stanford_basic/dist/css/theme.css b/themes/stanford_basic/dist/css/theme.css
index 189da13dd..a59b35e59 100644
--- a/themes/stanford_basic/dist/css/theme.css
+++ b/themes/stanford_basic/dist/css/theme.css
@@ -1,10 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-.stanford-basic--outline{outline:0;position:relative;-webkit-transition:outline .5s ease-in-out;transition:outline .5s ease-in-out}.stanford-basic--outline .block--local-tasks{opacity:0;-webkit-transition:opacity .5s ease-in-out;transition:opacity .5s ease-in-out}.stanford-basic--outline:focus,.stanford-basic--outline:hover{outline:5px solid #89ceff;outline-offset:-5px}.stanford-basic--outline:focus .block--local-tasks,.stanford-basic--outline:hover .block--local-tasks{opacity:1}.block--local-tasks{margin:0 auto 10px;z-index:10}.block--local-tasks li,.block--local-tasks ul{margin:0}.block--local-tasks ul{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;list-style:none;margin-top:15px;padding-left:0}.block--local-tasks ul li{line-height:unset}.block--local-tasks.sticky{position:fixed;top:0;width:100%;z-index:15}.block--local-tasks .page-content-label{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.block--local-tasks .edit{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.block--local-tasks .delete{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.block--local-tasks .delete a:before{padding-right:1em;padding-left:1em;font-family:Font Awesome\ 5 Free;content:"\f2ed";font-size:1.6rem;font-weight:400}@media (min-width:768px){.block--local-tasks .delete a:before{font-size:1.8rem}}@media (min-width:1500px){.block--local-tasks .delete a:before{font-size:1.9rem}}.block--local-tasks .manage-display{margin-left:auto;-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.block--local-tasks .layout,.block--local-tasks .shortcuts{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.block--local-tasks .roles,.block--local-tasks .version-history{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.block--local-tasks .devel{display:none}.block--local-tasks a{padding:15px;font-weight:400;color:#fff;background-color:#006cb8;border-right:1px solid #00548f;border-bottom:1px solid #00548f;text-decoration:none;text-wrap:nowrap}@media (max-width:767px){.block--local-tasks a{padding:10px 5px}}.block--local-tasks a.is-active,.block--local-tasks a:focus,.block--local-tasks a:hover{color:#fff;background-color:#00548f}.role--anonymous .stanford-basic--outline{-webkit-transition:none;transition:none}.role--anonymous .stanford-basic--outline:focus,.role--anonymous .stanford-basic--outline:hover{outline:0}.role--anonymous .stanford-basic--outline .block--local-tasks{opacity:1}.role--anonymous .stanford-basic--outline .block--local-tasks.sticky{position:relative}#back-to-top{display:none;position:fixed;bottom:20px;right:20px;text-align:center;border-radius:7px}
-=======
-.stanford-basic--outline{outline:0;position:relative;transition:outline .5s ease-in-out}.stanford-basic--outline .block--local-tasks{opacity:0;transition:opacity .5s ease-in-out}.stanford-basic--outline:focus,.stanford-basic--outline:hover{outline:5px solid #89ceff;outline-offset:-5px}.stanford-basic--outline:focus .block--local-tasks,.stanford-basic--outline:hover .block--local-tasks{opacity:1}.block--local-tasks{margin:0 auto 10px;z-index:10}.block--local-tasks li,.block--local-tasks ul{margin:0}.block--local-tasks ul{display:flex;flex-direction:row}.block--local-tasks.sticky{position:fixed;top:0;width:100%;z-index:15}.block--local-tasks .page-content-label{order:1}.block--local-tasks .edit{order:3}.block--local-tasks .delete{order:4}.block--local-tasks .delete a{font-size:0}.block--local-tasks .delete a:before{content:"\f2ed";font-family:Font Awesome\ 5 Free;font-size:1.6rem;font-weight:400;padding-left:1em;padding-right:1em}@media (min-width:768px){.block--local-tasks .delete a:before{font-size:1.8rem}}@media (min-width:1500px){.block--local-tasks .delete a:before{font-size:1.9rem}}.block--local-tasks .manage-display{margin-left:auto;order:5}.block--local-tasks .layout,.block--local-tasks .shortcuts{order:6}.block--local-tasks .roles,.block--local-tasks .version-history{order:2}.block--local-tasks .devel{display:none}.block--local-tasks a{background-color:#006cb8;border-bottom:1px solid #00548f;border-right:1px solid #00548f;color:#fff;font-weight:400;padding-bottom:10px;padding-top:10px}.block--local-tasks a.is-active,.block--local-tasks a:focus,.block--local-tasks a:hover{background-color:#00548f;color:#fff}.role--anonymous .stanford-basic--outline{transition:none}.role--anonymous .stanford-basic--outline:focus,.role--anonymous .stanford-basic--outline:hover{outline:0}.role--anonymous .stanford-basic--outline .block--local-tasks{opacity:1}.role--anonymous .stanford-basic--outline .block--local-tasks.sticky{position:relative}#back-to-top{border-radius:7px;bottom:20px;display:none;position:fixed;right:20px;text-align:center}
-/*# sourceMappingURL=theme.css.map*/
->>>>>>> fixup for assets folders
-=======
-.stanford-basic--outline{outline:0;position:relative;transition:outline .5s ease-in-out}.stanford-basic--outline .block--local-tasks{opacity:0;transition:opacity .5s ease-in-out}.stanford-basic--outline:focus,.stanford-basic--outline:hover{outline:5px solid #89ceff;outline-offset:-5px}.stanford-basic--outline:focus .block--local-tasks,.stanford-basic--outline:hover .block--local-tasks{opacity:1}.block--local-tasks{margin:0 auto 10px;z-index:10}.block--local-tasks li,.block--local-tasks ul{margin:0}.block--local-tasks ul{display:flex;flex-direction:row}.block--local-tasks.sticky{position:fixed;top:0;width:100%;z-index:15}.block--local-tasks .page-content-label{order:1}.block--local-tasks .edit{order:3}.block--local-tasks .delete{order:4}.block--local-tasks .delete a{font-size:0}.block--local-tasks .delete a:before{content:"\f2ed";font-family:Font Awesome\ 5 Free;font-size:1.6rem;font-weight:400;padding-left:1em;padding-right:1em}@media (min-width:768px){.block--local-tasks .delete a:before{font-size:1.8rem}}@media (min-width:1500px){.block--local-tasks .delete a:before{font-size:1.9rem}}.block--local-tasks .manage-display{margin-left:auto;order:5}.block--local-tasks .layout,.block--local-tasks .shortcuts{order:6}.block--local-tasks .roles,.block--local-tasks .version-history{order:2}.block--local-tasks .devel{display:none}.block--local-tasks a{background-color:#006cb8;border-bottom:1px solid #00548f;border-right:1px solid #00548f;color:#fff;font-weight:400;padding-bottom:10px;padding-top:10px}.block--local-tasks a.is-active,.block--local-tasks a:focus,.block--local-tasks a:hover{background-color:#00548f;color:#fff}.role--anonymous .stanford-basic--outline{transition:none}.role--anonymous .stanford-basic--outline:focus,.role--anonymous .stanford-basic--outline:hover{outline:0}.role--anonymous .stanford-basic--outline .block--local-tasks{opacity:1}.role--anonymous .stanford-basic--outline .block--local-tasks.sticky{position:relative}#back-to-top{border-radius:7px;bottom:20px;display:none;position:fixed;right:20px;text-align:center}
->>>>>>> Updated webpack setup to match stanford_profile_helper
+.stanford-basic--outline{outline:0;position:relative;transition:outline .5s ease-in-out}.stanford-basic--outline .block--local-tasks{opacity:0;transition:opacity .5s ease-in-out}.stanford-basic--outline:focus,.stanford-basic--outline:hover{outline:5px solid #89ceff;outline-offset:-5px}.stanford-basic--outline:focus .block--local-tasks,.stanford-basic--outline:hover .block--local-tasks{opacity:1}.block--local-tasks{margin:0 auto 10px;z-index:10}.block--local-tasks li,.block--local-tasks ul{margin:0}.block--local-tasks ul{display:flex;flex-direction:row;list-style:none;margin-top:15px;padding-left:0}.block--local-tasks ul li{line-height:unset}.block--local-tasks.sticky{position:fixed;top:0;width:100%;z-index:15}.block--local-tasks .page-content-label{order:1}.block--local-tasks .edit{order:3}.block--local-tasks .delete{order:4}.block--local-tasks .delete a:before{content:"\f2ed";font-family:Font Awesome\ 5 Free;font-size:1.6rem;font-weight:400;padding-left:1em;padding-right:1em}@media (min-width:768px){.block--local-tasks .delete a:before{font-size:1.8rem}}@media (min-width:1500px){.block--local-tasks .delete a:before{font-size:1.9rem}}.block--local-tasks .manage-display{margin-left:auto;order:5}.block--local-tasks .layout,.block--local-tasks .shortcuts{order:6}.block--local-tasks .roles,.block--local-tasks .version-history{order:2}.block--local-tasks .devel{display:none}.block--local-tasks a{text-wrap:nowrap;background-color:#006cb8;border-bottom:1px solid #00548f;border-right:1px solid #00548f;color:#fff;font-weight:400;padding:15px;text-decoration:none}@media (max-width:767px){.block--local-tasks a{padding:10px 5px}}.block--local-tasks a.is-active,.block--local-tasks a:focus,.block--local-tasks a:hover{background-color:#00548f;color:#fff}.role--anonymous .stanford-basic--outline{transition:none}.role--anonymous .stanford-basic--outline:focus,.role--anonymous .stanford-basic--outline:hover{outline:0}.role--anonymous .stanford-basic--outline .block--local-tasks{opacity:1}.role--anonymous .stanford-basic--outline .block--local-tasks.sticky{position:relative}#back-to-top{border-radius:7px;bottom:20px;display:none;position:fixed;right:20px;text-align:center}
\ No newline at end of file