Full threadlygaret·I couldn't find anything either on your features page or in the screencast - how do you handle conflicts and conflict resolution?View on HN