changed circle error ouput
conflict resolved