style merge
style fixes