more changes
merge fixed