II = 1 now
merge error