Merge and check conflicts
Check Conflicts test vectors
Merge of vectors test