How Kylie and Kendall Jenner Finally Hashed It Out A Month After Explosive Fight