Fixed small logic error with direction of movement arrow on resolve
conflict.