My first change
Resolved conflict