Fixed Merge Changes