Add Auto
Resolved Conflict