Fixed invalid composer.json merge conflicts found.