Updates git-erase-local script to use upstream changes to resolve conflicts