finetuning of diff concat and conflict detection