details working correctly
merge fix