Merged changes:

Please dont name of edmx everytime you commit.

Right click update to update edmx.