merge and football fix