reformat before merge
merge