https://drorlandini.com/articles/resolving-conflict/