Updated version file and removed merge backups