Does anyone else get "nonmergeable file needs merge" errors on updates? The last one I got should have been fine -- the changes were independent and non-overlapping.