Initial commit
Merge https://github.com/mbogochow/DirConflict