compiles for msp430
resolve makefile merge conflicts