Solve Merge issue