conflict resolution mode, to use newer of the local and the server side data, when a conflict is detected