Adding struts
conflict
resolving conflicts
Css modif
rm