Updated conflicts from merge