Fixed readData
Conflict Resolution
Conflict Resolution