Fix bug + try multiple merge