Removed remaining strings from resolving conflicts.
	modified:   mscore/musescore.cpp