d-current css
fixed merge
cssalot
fixed merge conflicts