Restoring merged away changes