Here is my timeline:

Jan 2001 to October 2005- F1 Student visa
October 2005 to Present - H1B work visa

Over the years, I have been filing 1040NR. But this year due to substantial presence test, I think I need to file 1040. Can someone please confirm?