Solving merge issue