Different tds amount taken by cpc

For AY  2016-2017  filed before due date

1)  Rs X  came in 26AS after i filed the return hence was not claimed.

2) Rs Y  for the same TAN number as X was brought  forward from AY 2015-16 ( Rs Y was C/F in return AY 2015-16)

3)  CPC Banglore  ignored Rs Y and has taken  Rs X  in ITR process and given me less Refund.

4) Now Rs Y remained  still unclaimed even though i have claimed in return and Rs X is claimed though not claimed by me bcoz no entry was there at the time of filing return.

Can Some guide me what to do.

Whether to rectify return  with Rs  X  and C/F to AY 2017-18. ?

or Revise the return taking Rs X on Tax credit side and on Income side  (My accounting on receipt basis)

Thanks in advance