before pull v2
merge resolve