recommit footer - conflict