Fixing Merge Issue