shutup test merge