Resolved conflict in data