make permanent saving and prevent conflicts