fixed excepption on conflicts in merge