Fixing merge disasters