little css
fixed merge conflict
corrected merge conflict
 uno mas omission
merge conflicts
-A