attempting to fix problems
merge fix