I got the same issue.For this issue you can do one thing,You just export all modules whatever you changed, into mpk files except navigation page, then delete your local project, now download from team server and then import all files that you have exported and commit.Now you wont get the issue.