resolved conflict
test corrected