FINAL merge problems solved