Pulling in Master Erases things from my Branch without even Making a Merge Conflict - C#