Reduce conflict to follow treasure-data branch