added debug info
save state to shared preferences
 resolved conflicts