Prefix upstream conflicts with 'Possible conflicts:'