Renamed Conflict -> ConflictController
Renamed ConflictController->Conflict
Changes to Conflict.java
Code Style in conflict classes.
Deleted ConflictService
Merge pull request #83 from paffman/cleanup-wpConflict

Cleanup wp conflict