Fixed merge results