testing
added example files for default run
fixed merge conflicts