fix things
merge