review cards added
review cards ready
conflict fixed