Fix new/edit review logic
Fix merge conflicts