update to restore from bad git merge