started work on merge.c commited to move back to iMac