shitty merge part 3