Conflict

Added Conflict.
Update Conflict.java

Added CTF and fixed string uppercase.
Merge pull request #31 from ShaunDepro/master

Conflict Config