fixed style things
merged