changes
remove conflicted files
ability to get test run parameters from command line or from props