merge env changes with restart changes