Resolved conflict
Resolved conflict