One last ID conflict change + last minute config merges