.
seperate content from presentation
seperate content and presentation for html/css
fix conflict then commit the result