Initial Commit
Initial version
Merge branch 'master' of https://github.com/JakeLin/ConflictResolver