fixing size of footer only on merge
fixing merge conflicts