ManipulateData.py
Fixed merge conflict