Adding the initial source
Resolving conflict