add two issues controller tests
solve conflict