Fix duplicity after merge part 2