new qs
resolved confilct