safari merge

safari merge