attempt merge again (manually)