Merge problems solved