Conflicting change
Resolved pull