testing conflict resolution
testing conflict resolution: added test file
Merging Cheng's changes