Effectively Resolve Conflicts
Discussion