Fix partial update conflict with validation