Resolving conflict
Resolving conflict No2