fix merging errors for operations that are never performed