modification of experiment in test/
fixed merges