Title: Resolving Conflicts Just Like Jesus Christ