changed setup name ref
fixed merge