footer: fix conflicts