Text search works
Text search works, conflicts resolved