Resolve Conflict #2