Shell conflict fix