Random changes
Resolved conflicts