tidy after merge