fixed style
merge and resolve conflict