Add PHPCS config
Add PHPCS dependencies
Merge conflict