Resolve legal and other complications in river demarcation project