added search function
fix conflicts