restore deleted data cuz of merge conflict