Resolving conflict
Resolving conflict to rebase