Final fix charger.c conflicts