Added requirements CPR20-CPR30
Resolved merge conflict