fixed format
merge