ged: fixed resolve
gerard: text changes