Best solution for breaking apart merge results