remove test data
fix merge issues