add tests for conflict detection of source files
Merge pull request #456 from mexx/detect-conflicts

add tests for conflict detection of source files