690s conflicts