addede save feature and fixed some other shit
fixed merge con