Update Conflict.java

Added CTF and fixed string uppercase.