Fix text Header and css with merge conflict.