Fixed merge error

Sorry about that! Also added back in descriptions so is a little more
clear what the headers are