Removed conflict resolution options
Fine tuned the autosave and the reload feature