changes michael
merge fix