css fixes
fixed merges