search form is implemented
resolve conflict