refactored Conflict.java to work with constants and with garment class