aft merge fix