formating
fixed merge