Attempting to merge my changes into the Master

I keep getting an error about the *.xcuserstate file