restore the mem loc instn cache to the previous version, need to check the new version
G
resolve conflicts