Created a template risk assessment table
Fixed merge conflict