fixing merge results