Merge problems resolved