Manual Merge Changes