fixed bug in test-loop.llb; fixed int[] = 3 typecheck
fixed merge errors