Fixed upsert -> conflict change