Cleanup update feed op validation for easier reading
Remove some merge warnings