fixed test
fixed conflicts