fixes merges and search