merge
fixed typo -> format