minimized style fixed
merge