add test for conflict resolution
handle paths better in test scripts