Fixed merge error with bling files