add shell3
resolve merge