Fixed Merge Updates