styles changed in entire project
tabular list changed
conflict resolved