resolved footer conflict