resolved conflict
fixed test
renamed id into code