now bne, and beq is tested and working
merging conflicts