Resolve conflicts

Author: manjusha729

CHANGELOG.md

@@ -1,6 +1,23 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+5.0.0
+---------
+### Enhancements
+* Provided support for PHP 8.4
+* Dropped the support for PHP 8.1
+* Removed unwanted dependent packages
+
+4.8.3
+---------
+### Enhancements
+* Bumped aws/aws-sdk-php package to 3.323.4
+* Bumped composer/composer to 2.8.1
+* Bumped laminas/laminas-diactoros to 3.4.1
+* Bumped nikic/php-parser to 5.3.1
+* Bumped squizlabs/php_codesniffer to 3.10.3
+* Remove any unused files remaining after upgrading Codeception.
+
 4.8.2
 ---------
 ### Enhancements

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "4.8.2",
+    "version": "5.0.0",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {