Add Ours and Theirs aliases