before floobits and icon right
merge res