storing
fixing merge conflicts
fixed css and a few errors