fixed formatting
 merging