merge styles
style fixes