Resolved conflicts
Merge