things have changed
merge fix