Originally Posted by Mattmatt
I have windows 7 to answer carnages question. I think merging them would be the best option, but I don't want to delete all my files and then be screwed, so I need to make sure how to do this right.
You have 2 options really:
1) Merge partitions: If you do this, you'll want to make sure there is no data on the Data partition. Then use a GParted LiveCD to delete the Data partition, and then expand your existing partition, taking up the "Unpartitioned space".
2) Move your data / large files to the "Data" partition: As I instructed above.