check if they "share" a file , if they do , my suggestion is to overwrite one and then add the other's changes manually...(I know it's a pain... but hey its interesting xD )


and about Bi I dont know it first hand I'm using alx