test commit for conflict
move everything to cloned dir, switch to minitest