added direction
conflict resolved