Entity Framework gets confused from time to time. What you need to do is remove the entity table from the model, and then rename the table in SQL Server to TableName_Temp, update the model, now the entity table should be fine, so delete the entity table, rename it back to the original name again and update the model again . Everything should be fine this time.
I know this is a confused procedure, but this is the only way to solve this problem without blowing away all edmx and starting from scratch. Currently, in my organization, we have a policy not to make changes to EDMX, if it is absolutely necessary, so that we can easily delete and recreate when necessary.
, !