add insert test
Merge Conflict