Little changes
Resolved conflicts