WATER FIGHT Garfield moves to end Impasse; city says issues remain