sharedPreference
conflict commit