Update Merging Error Fix