fixed first 4 tests
fixed conflicts