Merge Changes corrected