remove test
fixed merge