I just entered it in one place and not the other because they confirmed that it was double counting. This year, so far, I'm not running into the same issue (but I also haven't finished yet). Good luck!
