Update some merge conflicts to have pretty headers on eco benefits