Merge solved. Working