removed merge fluff