push pull
resolve
adding stars