minor changes
Resolving file conflicts