formatting
added yesConflict method