Merge branch 'master' of C:\xampp1\htdocs\git\his with conflicts.
Search BHYT + Check date BHYT