If I purchased $2000 RRSP and have $500 HBP to repay, do I report $2000 or $1500 RRSP contribution amount? When I enter $500 HBP repayment it doesn't adjust my return.