Various changes
Resolving conflict