Solve merge issue