fix WatermelonWithMe compile error
merge upstream