make conflict black