VS and MD also like to fight over ItemGroups.  You should always discard any project file changes that aren't directly related to your patch.