https://www.markkilby.com/articles/resolving-conflict-on-distributed-teams/