Had to manually resolve import conflicts in InteropTests.m
To be fair, the merge algorithm should have been able to do it.