Minor changes
Conflicted resolved