Minor changes
Conflicts resolved