Yes. HSA contributions made by you and your employer are in box 12 of your W-2 with the code W, don't enter that amount again in the HSA section. Delete any entry made in that section.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"