Resolved conflicts

Resolved conflicts