Refactoring bci experiment merge