convert tabs to spaces
Added tests for data import
merge files
fix merge