Fix merge issues

remove duplicate getLongFrom