removed merge files digiamp.c.*