Clean up GIT merge after machine move