added nullity check on touchDragged()
fixed merge conflict