resolve conflicts / search.php
conflicts