Resolving incorrect merge