.xcuserstate cleanup commit
Mergetool fix for .xcuserstate bs