Added splice from Steve Losh for three way merges