bf4badad1d
* add conflict detection * test pull request conflict files * fix detection files number * fix comments
* add conflict detection * test pull request conflict files * fix detection files number * fix comments