favoriting checkpoint until testing delivery
fixing favorites and spec
:
fixed merge error