merge setup changes