Updates changelog

waspc/ChangeLog.md

@@ -1,11 +1,18 @@
 # Changelog
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> f5d285d61 (Updates changelog)
 ## 0.14.0 (TBD)
 
 ### 🎉 New Features
 
 - Simplified Auth User API: Introduced a simpler API for accessing user auth fields (for example `username`, `email`, `isEmailVerified`) directly on the `user` object, eliminating the need for helper functions.
+<<<<<<< HEAD
 - Improved API for calling Operations (Queries and Actions) directly.
+=======
+>>>>>>> f5d285d61 (Updates changelog)
 - Auth Hooks: you can now hook into the auth process with `onBeforeSignup`, `onAfterSignup` hooks. You can also modify the OAuth redirect URL with `onBeforeOAuthRedirect` hook and get the provider token with `onAfterOAuthTokenReceived` hook.
 
   ```wasp