updated definitions and programs in prog-equiv
resolved conflict config.xml