Ran conflict detector class through PHPCS

This cleans up yet another class to meet the Loris coding standards