Fixed a merge error with Equipment.xaml.cs