removed test directory
Merged conflicts