Resolve Conflict
Resolve conflict