searching for bugs
merge