Working, combining search
conflicts resolved?