Resolve merge conflicts

CHANGELOG.txt

@@ -1,3 +1,34 @@
+= 3.3.5.2   - 21/11/2024 =
+* Fix   	- Fatal error when replacing gravatar image.
+* Fix       - Translation not working properly after WordPress v6.7.
+* Fix       - WordPress _load_textdomain_just_in_time notice after v6.7.
+
+= 3.3.5.1   - 19/11/2024 =
+* Fix   	- Edit profile form duplication.
+
+= 3.3.5     - 18/11/2024 =
+* Feature  	- All User Registration widgets for Oxygen builder.
+* Enhance	- My account page design.
+* Enhance   - Most used integration list on integration settings in form builder.
+* Tweak     - Global settings design.
+* Fix		- Form save action not working for initial form publish captcha setting.
+* Fix		- Random order of form fields in email template during user registration.
+* Fix		- Hide Unapproved Users action run for users not from our source.
+* Dev		- Compatibility for convertKit.
+
+= 3.3.4.1  - 16/10/2024 =
+* Fix      - Setup wizard going blank on registration settings step.
+
+= 3.3.4    - 16/10/2024 =
+* Enhance  - Separate Captcha Settings for Login and Registration Form.
+* Tweak    - My account selection validation and install pages.
+* Tweak    - Send new registered email if approval link email is disabled.
+* Dev      - User edit feature for admin.
+* Dev 	   - Compatibility for Conditional logic in row.
+* Fix      - Logout not working when redirect URL is home page.
+* Fix      - Export CSV user with big data cause the bad gateway error.
+* Fix      - Date Range throws validation message when date field is localized.
+
 = 3.3.3    - 19/09/2024 =
 * Fix      - Select all option not working in checkbox field.
 * Fix      - Continue setup wizard button not working properly.
@@ -41,11 +72,7 @@
 * Dev       - Compatibility for Authorize.net Addon.
 * Dev       - Compatibility for SMS verification.
 * Dev       - Add noreferer and noopener in all target blank anchor tags.
-<<<<<<< HEAD
-* Fix       - Unable to publish form from draft status.
-=======
 * Fix       - Unable to publish form from draft status.
->>>>>>> master
 * Fix       - Undefined variable $form_row_data.
 * Fix       - Disable default wordpress login not working.
 * Fix       - The email content translation issues with WPML plugin.