Fixed buf of not finding keys
Fixed merge conflics