fixed merge conflict from test_code into master