help in edmx mapping

Question

i created an edmx in visual studio c# web application. after creating the edmx and mapped the stored procedures, i found out that there was a missing relation between 2 tables.
so i went back to the sqlserver database and corrected the FK relation between the 2 tables, and i updated the edmx.
i also updated the stored procedure mapping in both entities, and i still get this error:

Error 3007: Problem in Mapping Fragments starting at lines 1833, 2510: Non-Primary-Key column(s) [WorkflowTypeID] are being mapped in both fragments to different conceptual side properties - data inconsistency is possible because the corresponding conceptual side properties can be independently modified....

in the database i made WorkflowTypeID as a forein key in one table. what should i do in order to solve this?
if anyone can tell me the steps so i can successfully change a relationship and update the edmx...