header styles changed
conflict resolved