conflict resolved
conflict resolved
conflict resolved
footer color