solve merge issue with main