Update Conflicter.Core
Update Conflicter.Service
Update web project
Update Conflicter.Tests