repair bugs after merge