add conflict for mimi