Resolving last merge conflict