Fixed conflicts.
Fixed the SearchFormParser parse method.