fix watch + serve together