Resolving conflicts with the last merge

Resolving conflicts with the last merge