solved merge conflict
another merge conflict
fiddled with main html
resolved merge cnflct