make sure everything is saved on first startup
merging