Resolved conflicts
Resolved conflict