Fixing forgotten merge part