remove merge conflicts from footer