Document conflict resolved