recommit
merge conflicts
fixing bug with search functionality