modal addded
merge fix