Merges base file's changes from two sources.
- Two identical changes don't yield a conflict
- Two different additions before same line yield a confilct
- In other cases two changes without a collision don't yield a conflict
- Addition vs removal yield a replacement
- In other cases two changes with a collision yield a conflict