fix fomatting and merge