Autosave fix

Resolved merge issues
Added the ability to select version