resolved conflicts

Author: Manjusha.S

.gitignore

@@ -22,4 +22,4 @@ dev/tests/functional.suite.yml
 /v2/
 dev/.credentials.example
 dev/tests/.phpunit.result.cache
-dev/tests/verification/TestModule/Test/testFile.xml
+dev/tests/verification/TestModule/Test/testFile.xml

CHANGELOG.md

@@ -1,6 +1,14 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+3.11.1
+---------
+
+### Fixes
+
+* Removed environment variable MAGENTO_ADMIN_PASSWORD
+* Fixed WaitForElementClickable action cannot be used more than once
+
 3.11.0
 ---------
 ### Enhancements
@@ -12,6 +20,7 @@ Magento Functional Testing Framework Changelog
 
 * Fixed incorrect MFTF test dependencies path
 * Removed PHP 7.3 build check from MFTF PR build as PHP 7.3 is no longer supported
+* Fixed fatal error when running generate:tests --config parallel -g 
 
 
 3.10.3

composer.json

@@ -2,7 +2,7 @@
  "name": "magento/magento2-functional-testing-framework",
  "description": "Magento2 Functional Testing Framework",
  "type": "library",
- "version": "3.11.0",
+ "version": "3.11.1",
  "license": "AGPL-3.0",
  "keywords": ["magento", "automation", "functional", "testing"],
  "config": {
@@ -22,7 +22,7 @@
  "codeception/module-asserts": "^1.1",
  "codeception/module-sequence": "^1.0",
  "codeception/module-webdriver": "^1.0",
- "composer/composer": "^2.0, !=2.2.16",
+ "composer/composer": "^1.9 || ^2.0, !=2.2.16",
  "csharpru/vault-php": "^4.2.1",
  "guzzlehttp/guzzle": "^7.3.0",
  "laminas/laminas-diactoros": "^2.8",