Small corrections
Conflicts