Fixed unresolved symbol
Baseline bling
,merge