Resolved conflict with autogenerated code