BASE better feedback about clickable thingies
EVALUATION resolving merge conflict