Fixed styles
merge