Ran conflict detector class through PHPCS
Merge pull request #733 from driusan/PHPCS-ConflictDetector

Ran conflict detector class through PHPCS