style correction
merge