working on what we do
Conflicts resolved in css, more work done aslo