moved everything out of test/ and deleted it
fixed conflict