Yolo.
Fixed merge conflict when we both tryed to fixe the same lose of data problem.