Sometimes there can be a automated solution to conflict management. We should have a few automated conflict resolvers (server wins, newest wins etc) to make lives easier for developers.