GET TEST_ALU WORKING
Fix conflicts