fix wrong conflict resolution