added Shoelace
fixed conflicts