Fixed merge issues and it compiles and stuff

also there should probably  be a way to unstar a card