removed merge conflict footer