Minor changes
Resolving conflict