save button+notifbar
conflict fix