bl
colors
fixed merge