modal stylin
merge fix