Adding new data
Solving conflict