i'm awake again
solved merge conflict on onStop()