Remove conflicts