Resolving conflict for gigantipull