<<<<<<< OURS ||||||| ANCESTOR ======= >>>>>>> THEIRS