added protection to Makfile against deploying cvs conflicts