solve merge issue