"Fix conflict" => "Fix convict" - thanks, #skype autocorrection (or was it OS X?)