style udpate
style merged