datamanager update
resolve conflicts
start to implement technicals
Delete .csv files